Fixed #2
Merge branch 'origin/master'