Merge pull request #41 from nolanfilter/Nolan

Nolan