Made the module more generic
0.1.0