wip
Merge pull request #7 from saito400/20140919test

wip