merge from ram
Merge pull request #2 from tsl143/master

merged and All integration working