Last touches
Merge pull request #54 from CIPowell/master

Finishing touches