Merge pull request #219 from Cook1fan/master

2014-10-21
Merge pull request #220 from Cook1fan/master

re
2014-10-31
''