first version
Merge pull request #1 from borkweb/master

first version