some changes
Merge github.com:Insality/Cattus