Added reserved characters. New Bug: ':' and ';' are linked, so can't do ';'.
Merge branch 'master' of github.com:consindo/notes