Merge pull request #9 from robrwo/devel

Some changes for v0.3.4
Merge branch 'master' into devel