Fixes #17. Updated documentation