Use autoSub everywhere for proper cleanup
Bump version number