Closes #360
Merge commit '03a8699e0f1d4622aa39b3c7e09734ccb7faee44' into HEAD