first pass

Probably I should look at it again
Merge pull request #4 from chaals/patch-1

first pass