Merge pull request #9 from greatwolf/master

Added some compatibility improvements and changes