Merge pull request #1 from caman9119/master

Requesting latest build
New Functions

Corrected some logic and added some new features
Merge pull request #3 from seviLopaC/master

Refactoring Complete