Issue #182 Added minor changes