v1.0

Merge completed 'develop' branch into 'master'