Updated to version 1.5-SNAPSHOT