Merge pull request #18 from PolluxAvenger/master