Patch accept return-type error ref #5
Merge branch 'devel'