Forgot to commit methods
Merge branch 'master' of github.com:angelaz/shine