added latest changes
Merge branch 'master' of https://github.com/taylorholberton/cedit