Merge pull request #2 from SolarLiner/master

Fork unwanted :/