transferring v.1.61 from googlecode