Merge pull request #23 from hreikin/devel

merge