Merge pull request #6 from Neonunux/master

Merge with Neonunux repository
Merge pull request #6 from colombbus/master

Merge pull request #6 from Neonunux/master