Directory support
Merge branch 'master' into directories

Conflicts:
	pendium.py
Error message handling
icon fixes
Merge pull request #1 from tavaresb/directories

Directories support