Conflicting bugs added
Optimisations
Merge pull request #67 from kaustabh/master

Conflicting bugs added