Merge pull request #5 from longpham91/master

merge
Merge pull request #16 from longpham91/master

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

Luke "fixed" crashes