test fixed
cs fixes
Merge pull request #14 from liuggio/master

test fixed, cs