Merge pull request #150 from nekromant/master