PR #146

Updated as PR #146