Bug fixes plus minor improvements
Rollback change
Updated project name
Merge pull request #9 from petercv/master

Bug fixes plus minor improvements