Pull Request for #114, #12 and #88

I have sent you pull Request for #114, #12 for outstanding tasks

Also I have completed one task from the new milestone i.e. #88.

From the next time I will sent you the pull request after each task/ticket done.