Fixed https://github.com/markkolich/curacao/issues/6
Fixed https://github.com/markkolich/curacao/issues/7