A36507 V 0.4.1

Updates to work with common modules