0.12.10

code re-factoring in progress