Merge pull request #6 from hreikin/master

merge master/devel branches