re-alignment
Merge pull request #26 from shyanfeng/master

re-alignment