Merge pull request #6 from Neonunux/master

Merge with Neonunux repository