Merge pull request #57 from pakozm/devel

Devel
Merge branch 'pako-devel' into release-v0.3.1