Merge pull request #7 from kjtanaka/master

Add some updates