Some changes
Merge branch 'master' of https://github.com/sugordon/Tonka.git