branch test
minor cleanup
added setup script
Merge branch 'dev'