version 1.6
Merge branch 'master' of github.com:skapfer/papaya