Will fix this later
Merge pull request #3 from maguro/master

Will fix this later