alexreardon Merge pull request #86 from vipulbhj/master