Closes #313
Merge commit '1f93a0203360f3b597322f3548e7506ea32bd1f7' into HEAD