Merge pull request #86 from andrewlxer/master