Merge pull request #26 from rajithv/sachini

Sachini
Sachini 1_5: fixing problems in Machinery controller