Merge pull request #49 from sexnothing/master