Merge pull request #8 from necrose99/master