Version 0.12, small tweaks and changes post testing.