Fix for github issues #74 and #71 along with some documentation corrections.