fixes #113
Merge origin/master