added aggregate handling
added a bit of version control
Merge branch 'master' of https://github.com/jutuomela/IoTprotocol