Merge pull request #13 from Cook1fan/master

2014-09-25
2014-09-25
''
Merge pull request #14 from 394802198/master

2014-09-25