Last changes
Shit works!!! :D
Merge pull request #2 from gentoomaniac/master

updates