Merge pull request #35 from insidenothing/insidenothing-patch-2