Merge pull request #4 from Aasmul/2.3-compatch

2.3 compatch
new 2.3 compatch changes
Merge pull request #63 from bnormoyle/2.3-compatch

2.3 compatch