Merge pull request #76 from everydayhero/jr-cleanup