Merge pull request #216 from sej7278/master

Really fix $MONITOR_PORT detection. Fix #215