Finish working prototype.
Merge pull request #2 from dheiniger/feature

Finish working prototype.