0.12.4

code re-factoring in progress