Merge pull request #6 from Jojo-Schmitz/master

fixing the QML version, simplifying the JS one and improving both