Fixes #223 non-void return issues.
Merge branch 'bug-223-non-void-return' into devel