Merge pull request #1 from hreikin/master

update devel to match master