Fixed incorrectly exported modules.
Merge branch 'v0.1.4'