Freeeaky Merge pull request #109 from spaz926/patch-1