Makes storage location configurable.
Tweaks to configurable storage feature.
Merge pull request #9 from marcoVermeulen/master

Makes storage location configurable.