Activity

it's in a bad shape, but hey, we don't want to keep so many branches around! 
Fixes #8