Merge pull request #100 from RayKwon/master