the branch for #1

this is a branch for the #1 and 0.0.3