Fixed Issue #354 functions returning void

Removed return statements. Functions will now return null.