Fix for #9, minor doc fix