(fix) Couple of errors
Merge pull request #48 from NBallaney/master

(fix) Couple of errors