Merge pull request #1 from hreikin/master

update devel to match master
Merge pull request #2 from hreikin/devel

Merge pull request #1 from hreikin/master