Comments and renaming of some misspelled functions.
Merge branch 'develop' of github.com:Johannestegner/SomeOriginalName into develop