Issue 59

ref issue#59