Some annotation added and bug fixed
v1.0.1
Fixes #1