created dev branch and some other minor changes
Merge pull request #1 from theZieger/dev

created dev branch and some other minor changes