Issue #218 - applied reviewer's comments