commit on 24.05.2014
Merge https://github.com/yaju1234/kq