fixed issues with data expansion
Merge branch 'master' of https://github.com/ifraixedes/hack-RCUKGatewayResarch112013