Merge pull request #113 from nolanfilter/Nolan

Nolan updates