Fix problems occured when specifying directories
Merge pull request #14 from haripo/prototype

Fix problems occured when specifying directories