Merge pull request #17 from longpham91/Long

update
Merge remote-tracking branch 'origin/Luke'
Updated GUI

Luke "fixed" crashes
Merge pull request #20 from Superenergiez/master

update
Merge pull request #23 from longpham91/Luke

Merge pull request #19 from longpham91/Long
Merge pull request #24 from longpham91/master

update