resolves the merge issue
Merge pull request #27 from jeremyBass/master

resolves the merge issue