Merge pull request #1 from tadpolecc/4.5

4.5
Merge pull request #17 from kcristiano/4.5

Merge pull request #1 from tadpolecc/4.5