Add merged changes.

Add changes merged from Dans original repository
Merge pull request #1 from Dan-in-CA/Tracking_JMRemote

Add merged changes.