Merge pull request #2 from Flast/kyubu/1

PR1
PR2