Merge pull request #85 from 394802198/master

Steven
re
Merge pull request #86 from 394802198/master

2014-05-03
Merge pull request #83 from Cook1fan/master

Steven