Tailored project to my constraints
Update repo to version in google code