Just backup commit, several changes made on sample project.