#317 reversing PR #318, as it incorrectly went to the master branch