Some fixes
Merge pull request #23 from futurelink/develop

Some fixes