Merge pull request #44 from Cook1fan/master

Steven
2014-03-28
Merge remote-tracking branch 'origin/master'
Merge pull request #54 from 394802198/master

Steven