Merge pull request #21 from GotoLink/master

Merge conflict fixed
Merge remote-tracking branch 'upstream/master'
Fixed Remote Gui closing when far from Block
Merge bug