Merge pull request #238 from ryedin/master

if you must know, read the commit... nosey guy