Merge pull request #181 from Cook1fan/master

Steven
2014-08-19
Merge remote-tracking branch 'origin/master'
'2014-08-19'