modify style
Modify collie
Merge branch 'master' of github.com:puritys/collie