Fix nice indexing bug :)
Fix merging
Merge branch 'master' of https://github.com/amonszpart/globOpt