Merge pull request #6 from hreikin/master

merge master/devel branches
Merge pull request #7 from hreikin/devel

Merge pull request #6 from hreikin/master