Merge pull request #73 from Socioware/master

socioware-13w49 release