Merge pull request #8 from hreikin/master

merge master/devel branches