Updated code, icons, tests, etc. ready for Marketplace entry