Version update
Merge branch 'master' of github.com:smc/Chilanka