Implemented kitty guidelines
Merge pull request #1 from mer8/hannah_feature

Implemented kitty guidelines