Fixes #223 non-void return issues.
Merge remote-tracking branch 'devel/bug-223-non-void-return-correct' into devel-master

* devel/bug-223-non-void-return-correct:
  Fixes #223 non-void return issues.