Merge pull request #45 from pakozm/devel

Devel merge with Master
Merge branch 'master' into pako-devel