Fixed issue #13
https://github.com/markkolich/curacao/issues/13
Merge branch 'master' of https://github.com/markkolich/curacao