Merge branch 'master' of github.com:gaborcsardi/cranky
Merge branch 'master' of github.com:gaborcsardi/cranky