Added file/directory support

Created checks for files and directories and did some cleaning up
Merge pull request #17 from ckolek/jeffDevelopment

Added file/directory support
Merge branch 'development' into chris_development