Merge pull request #5 from OctoFalcon/master

Merge from OctoFalcon/astrid to SurojitMandal/astrid
Merge pull request #6 from OctoFalcon/master

Merge from OctoFalcon/astrid to SurojitMandal/astrid
Merge pull request #7 from OctoFalcon/master

Merge from OctoFalcon/astrid to SurojitMandal/astrid
Merge pull request #24 from SurojitMandal/master

Merge into OctoFalcon/astrid