Fixed issue #18.  Layout may need some work, but probably good enough for first release.