Merge pull request #5 from RedEnchilada/statusnet-1.0.1

Merge