faster, more reliable fixes for #2 and #3
0.2.2