Merge branch 'master' into develop
#14 Making log system
Merge branch 'develop'