Final touches
Merge pull request #129 from nolanfilter/Nolan

Final touches