Last commit for some time, need to concentrate and have other projects running
Merge branch 'testing' of https://github.com/xvzf/Infinity into testing