tested some stuff
Merge branch 'R2-Dev' of github.com:kurigohan/toolshare into R2-Dev
fixed merge error