updated setup files

Merge Dev to master for deployment