v0.12 update.
Merge pull request #9 from kotowicz/master

v0.12 update