Merge pull request #31 from Cook1fan/master

Steven
Merge pull request #32 from Cook1fan/master

Steven
a
Merge remote-tracking branch 'origin/master'
Merge pull request #33 from Cook1fan/master

2014-03-24
2014-03-24
Merge pull request #43 from 394802198/master

Steven