Fixed Issue #354
Merge pull request #355 from abusalam/master

Fixed Issue #354 functions returning void