Merge pull request #37 from prashantkhandelwal/master
Closes #37