20140731-SNAPSHOT: some changes for next version.