Merge pull request #16 from nolanfilter/Nolan

Nolan