Modules and fixing #16

Modules in order to make it compatible with android platform. Fixing #16 as I've also got more information regarding the problem (see #16 for details).