Closed Marcoevich closed 9 years ago
& other minor changes
The merge conflicts are changes from another guy that I didn't sync back into my fork, however those changes are added to my pull request as well. Should be no problem merging this. Thanks!
& other minor changes