Fix for issue #22
Updated docs