Merge pull request #64 from pakozm/devel

Merge with devel
Merge branch 'master' into pako-devel
Merge branch 'pako-devel' into devel