Merge pull request #19 from osandov/master

A couple of fixes
Update authors