Merge pull request #89 from flooey/master