some changes
Merge branch 'demo' of http://github.com/cjacks0413/thurayya
Merge branch 'demo' of http://github.com/cjacks0413/thurayya into demo
test