fixed errors introduced while merging
Merge pull request #2 from srobb1/master

fixed errors introduced with last merge