Fixes #14
Merge pull request #15 from cloudescape/fix_issue_14

Fixes #14