Merge pull request #14 from mauriceling/master

Merge pull request #77 from clarencecastillo/master