Merged with develop and fixed bug
Merge pull request #150 from if045/RS-tech

RS-tech