Merge pull request #36 from nolanfilter/Nolan

Nolan