Fix for #59 as suggested by Tony Yan
Merge pull request #60 from malaverdiere/my-develop

Fix for #59 as suggested by Tony Yan. Thanks!