Fixed #101
Merge origin/master