reverted to 0.3.1 with extend fix due to bugs in HEAD