issues-21 multi system support added