Made work on PC
fixed merge
Merge branch 'master' of https://github.com/cakelake/FireFly