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