Merge pull request #35 from TheSeparateFirst/master