Merge pull request #1 from oyvindkinsey/master

pulling in most recent easyXDM updates