ready to upload
fixed symbolic link
Merge branch 'setup'