bugfixes and cleanup
Merge branch 'master' of http://github.com/ardila/signal_aggregation