for saucy
Merge branch 'master' of github.com:ronalde/quimup