Issue 141

Close #141 
Fair .. ok thanks!