Release 1

Moving version one working copy to master