0.12.6

code re-factoring in progress