Fix issue #19
Fix issue #17
Update AUTHORS file
Bump version