Issue 241

Updates for 1.8.1, needs tested on large data set