closes #31
Merge pull request #32 from apennebaker/master

closes #31