first attempt
Merge pull request #8 from woobe/master

first attempt