Fixed an error with last merge. Why is git merging so difficult?
Merge pull request #5 from Italic-/master

Third one today... Let's see if I can get this one right...
Merge pull request #4 from meta-androcto/master

Fix...