smaller changes, renaming
bugfix
renaming, smaller changes
Merge pull request #1 from mth08/master

Refactors