now working on 3.0.5-SNAPSHOT