Issue 148

This hould solve issue #148