Merge pull request #1 from shukitchan/master

Initial Checkin