Merge pull request #11 from mraof/master

dfg
RAGEQUIT
Merge pull request #25 from iconmaster5326/master

I think I'll work on something ELSE today.