Merge branch 'JMX'
Merge pull request #2 from siliconchris1973/JMX-the-2nd

Merge branch 'JMX'