Fixes #15. Allows a specified directory name to be used

* Backward compatible with the old scheme that uses the name
* Added a test
* Updated readme