Initial commit of version 1.7