Bug Fixes version 1.0.1