Merge pull request #16 from AoteChou/master

heyheyhey~