Changes for release 1.0.1. This fixed #1 and #2