Issue#7

Close #7