added twolfson's changes manually
0.1.5