Removed unneeded files in base directory
Merge remote-tracking branch 'origin/master'
Made cursor position update script work in a more general way