More stuf changed
Merge pull request #3 from windust/master

More stuf changed