4.5 update
Merge pull request #5 from ryansroberts/master

4.5 update