Issue3

Resolve #54