Working
Merge branch 'master' of github.com:roddehugo/picasso