first cut
Merge pull request #46 from azmikamis/master

First cut - thanks!