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