decent commit message
base version
Merge branch 'master' of https://github.com/AdnanUddin/cj2014