Changed as requested

Ref #115