fixed #1
Merge branch 'issue-1' into devel