Merge pull request #195 from demianbrecht/master