Merge pull request #30 from Cook1fan/master

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

Steven