Fix #5  - Version 1.0.1