Updated to new 0.1.3-SNAPSHOT