Merge pull request #10 from alexlatchford/master

Make sure we can run the script for other directories.
Merge pull request #11 from alexlatchford/master

Fix the tests
Fix minor bug