#256
Merge branch 'master' of https://github.com/matlo/GIMX.git