Minor Fixes
Version Update
Merge pull request #1 from ubc/master

Minor updates
Merge pull request #15 from brabbins/master

Requesting repull