updated to mhollings's 0.3.1 version