Workaround for issue #8
Merge branch 'htc-evo'
Add a test for issue #8