Merge pull request #28 from a1153tm/master

#7 closed #9 closed
#29 closed