Merge pull request #233 from lucasbergman/master