update to 1.2
Merge branch 'master' of github.com:thx/crox