Merge pull request #9 from petercv/master

Bug fixes plus minor improvements
Merge remote-tracking branch 'origin/master'
Missing method