Merge pull request #6 from necrose99/patch-1