Fixes
Minor Bugfixes
Merge pull request #2 from Jan93/testing

Testing