Add support for modules (#24)
0.3.1