Fix #65
Merge branch 'dev' of github.com:deshack/kyss into dev