Merge pull request #12 from wenfengwang/master

More Configurable fields and mores