Merging to 0.5-SNAPSHOT version