Fixed $MONITOR_PORT detection, thanks choffmann
Merge pull request #214 from sej7278/master

Fix $MONITOR_PORT detection, thanks choffmann

Fix #213
Made all the changes into one commit that could be a patch for master