Fixes #9 - initial cut. Probably could use more info