Merge pull request #34 from ss2783/master