Merge pull request #12 from nolanfilter/Nolan

Nolan