Various Fixes
Merge pull request #4 from noobxgockel/master

Various Fixes!