closed #103
closed #102
Merge pull request #104 from a1153tm/master

closed #102 closed #103