Fixed #6
Merge origin/master