Merge pull request #77 from Cook1fan/master

Steven
Merge remote-tracking branch 'origin/master'
2014-04-24
Merge pull request #80 from 394802198/master

Steven