Various fixes
Merge pull request #7 from immortius/develop

Various fixes