to devel Lynos
Merge pull request #4 from LynosSorien/devel-xinsen

to master