Update 1232

fdcc
Merge pull request #1 from epolarsys/master

Update 1232