init
Merge pull request #1 from seyon/master

..