Fix issue13
Merge pull request #14 from coltcloud/issue13

Fix issue13