Closes #84
Merge pull request #95 from dchandekstark/issue-84

Closes #84