Merged branch 'pants' into develop

Fixes #19
Please note that the PANTs feature is disabled by default