Merge pull request #9 from hreikin/devel

Merge pull request #8 from hreikin/master
Merge branch 'master' into devel