Merge pull request #65 from pakozm/devel

Devel
Merge pull request #66 from pakozm/devel

Devel
Merge branch 'master' into pako-devel