Update 12112014
Merge remote-tracking branch 'choose_remote_name/master'
Change version to 1.0