Fixed some bugs I recently introduced
Merge branch '2014.01.07' of github.com:EOL/eol into 2014.01.07