Merge pull request #653 from tsl0922/tsl0922-patch-1