handle returns
Merge pull request #8 from tomvantilburg/master

toms group work
Merge pull request #8 from stvno/master

handle returns