working example, not sure I like the interface
Merge branch 'develop' into topic/staticfiles
Merge branch 'develop' into topic/staticfiles
fix stupid mistake