Bugs, typos fixed
Merge branch 'master' of https://github.com/abhiQmar/DaiictCpiCal