Fixed hard-coded stuff.
Merge branch 'master' of github.com:AcklenAvenue/Invio