Merge pull request #189 from nullquery/master

Fix for #168 + removed FILE_DIR from .dme
Merge pull request #6 from HypatiaStation/master

Merge pull request #189 from nullquery/master