Merge pull request #6 from penkar/master

Updating Bradley's repository with Jeffrey's work.
Minor tweaks.
merge complete
merge attempt again.