Merge pull request #1 from tadpolecc/4.5

4.5