Fixed issue #5: ".." notation not resolved correctly
Merge commit '0461e060f1fcfc8e0b0b73e1d52cc68b9dd9afe2'