added tests
updated demo data
Merge pull request #44 from waalzer/master

added acceptance tests