Merge pull request #40 from nazgob/master.