Fixed #19
Merge branch 'issue19' into devel