0.12 final
Merge pull request #29 from tripzero/0.12

0.12 final