Merge pull request #96 from pakozm/devel

Devel
Merge pull request #97 from pakozm/devel

Devel
Merge branch 'master' into devel