Merge pull request #27 from jeremyBass/master

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

clear another merge conflict
Merge pull request #29 from jeremyBass/master

found another missed merge conflict