lordscarlet Merge pull request #19 from pyllyukko/master