all tests passing
Merge pull request #40 from nickpassarella/master

all tests passing