Improved class_wrapper
Merge branch 'master' of https://github.com/pakozm/april-ann