Fixes #18
2.1.0 quickfix
Merge remote-tracking branch 'upstream/master'