Fixes #223 non-void return issues.
Merge remote-tracking branch 'bug-223-non-void-return-correct' Fixex #223

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