Merge pull request #6 from ryersonlibrary/master

Update to latest from MJ
Merge pull request #12 from paulwc/master

Merge pull request #6 from ryersonlibrary/master