Fix for issue #50
Merge pull request #52 from molchanoviv/master

Fix for metadata loading issue