closes #49
Merge remote-tracking branch 'dushyant/master' into develop