Merged @brunoss code
Merge pull request #45 from AlienEngineer/brunoss

Merged @brunoss code