Merge pull request #14 from mauriceling/master

Merge pull request #77 from clarencecastillo/master
Merge pull request #78 from clarencecastillo/master

Merge pull request #14 from mauriceling/master