Merge pull request #13 from bruceravel/master

Awesome work!   I'll try to look at this in more detail over the next week or so.