initial version
Merge pull request #1 from zapion/master

initial version
r=me