removed symbolic link
update stashed changes (including changes added by kitanaisia)