Merge pull request #69 from whalliburton/master