Merged branch
Fixed a failed merge :(
MOOAAAR FIXES FOR FAILED MERGE!
Small fixes
More small errors
Small fix
Spello
Merge pull request #10 from rasmushaglund/master

PULL!!!