Clean up ANN demo

* Add lost commits
Merge pull request #6 from AlexanderFabisch/add_ann_demo

Clean up ANN demo