Merge pull request #4 from acltc/master

I don't understand this.