housekeeping
Merge pull request #1 from SaschaNaz/master

housekeeping