Fixed #312: added support for group and host properties, backwards compatible

are these tabs? please replace with spaces for consistency