Merge pull request #120 from Looted/master