switched return
Merge pull request #6 from zelgerj/master

switched return