Merge pull request #11 from PolluxAvenger/master