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