TODO
Merge branch 'shadowsky-devel' of https://github.com/flahemade/AG41