merged with 0.8.0-SNAPSHOT on 13/10/2014