Merge pull request #22 wei/master

also retabbed files