fixed issue 28 with jeremy's merge