Code update
Merge pull request #1 from TcM1911/trunk

Code update