Fixed #45
Merge origin/master