@add more test
Merge branch 'master' of github.com:FSource/Faeris-Demo