Merge pull request #102 from xwcg/christian

Christian