Improved build system #7, added new example, added collection-include files + some bug fixes