Merge pull request #55 from pakozm/devel

Devel
Merge branch 'master' into devel