Fixed bug 1.0.1
Merged with 1.0.2