Merge pull request #1 from TotalFreedom/master