Modification from fork .wq
Merge pull request #16 from cflores/master

Modification from fork .wq