Finishing up variables
Merge branch 'master' of https://github.com/marksomnian/echode.git