20141215 -v1.0.0
Merge remote-tracking branch 'origin/master'