Updated to 0.8.1-SNAPSHOT