refresh list of available classes and fix bond issue

This contains the same changes as PR #18 but for indigo-devel.