Merge pull request #52 from justgo129/master

Previous #51