JDK 1.7
Merge branch 'master' of https://github.com/arnit21/kashi.git