Viv Rajkumar Merge pull request #40 from ustulation/master