added qualaroo
Merge branch 'master' into qualaroo
added qualaroo, 0.8.7
merged