Fixed imports and modified glass library data path.
Merge remote-tracking branch 'origin/master'