Updating to latest milestone version 2.1M2
Issue #25: updating to using groovy properties instead of methods