Fixed Issue #77
Merge origin/master
Fixed Issue #68