Created by: dark-eye
Fix for #36 (closed) issue. Also contain some QML warning fixes and some code clean up