Added ability to specify own storage dir