closes #16
Merge pull request #17 from mallim/master

Pull request pertaining to issue #16