First commit on nicks feature branch
Merge pull request #6 from kleinsch/add-nicks-feature

Merging Nick's Feature back to master