V1.0

Move changes to master as version 1.0.