added features
Merge branch 'master' of https://github.com/jokio/jok-play.git