Merge pull request #46 from NBallaney/master

(fix) Various errors
(fix) Couple of errors