Merge pull request #6 from kyoushuu/master

grilo: Port from JavaScript to Python