Fix issues
Merge branch '1.0' of github.com:lazychaser/cruddy into 1.0