Merge pull request #108 from azardilis/master

Argyris changes
README covers the usage of setup-dev.sh

that replaces setup.sh for development purposes
typo fix
Merge remote-tracking branch 'upstream/master'