added comments support, removed return