incorporates working directory
Merge branch 'master' of github.com:geni-gimi/GIMI