Fixed some bugs and added some test cases
Merge branch 'master' of https://github.com/WouterLok/GLT