o feature 2b (added return value)
Merge pull request #3 from philipmarivoet/feature_2b

Feature 2b