or implementation
Merge pull request #9 from bdrumheller/working

or implementation