Merge pull request #55 from pakozm/devel

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