Merge pull request #1 from OctoFalcon/master

Merge on 3rd Sept
Merge pull request #2 from OctoFalcon/master

Merge on 4 sep
Merge pull request #11 from SurojitMandal/master

Merge into local 5th sep