Merge pull request #26 from ysfl/master

Finished half of the repair