Merge pull request #1 from Mindar/master

Cleanup naming
Merge pull request #3 from ohbbies/master

Merge pull request #1 from Mindar/master