Merge pull request #260 from xu-cheng/switchless

Fix switchless sample code