Fixes Issue #29

Fixes #29 @chillu please review.