Merge pull request #15 from jackmakiyama/master

Master