(fix) Various errors
Merge pull request #46 from NBallaney/master

(fix) Various errors