Fixes #60
Merge remote-tracking branch 'remotes/origin/Issue_60'