fixed bug [Issue #1]
Merge remote-tracking branch 'origin/master'