Multiple bugfixes
Merge pull request #6 from c-das/master

Multiple bugfixes