Start of 0.8.1-SNAPSHOT