re
Merge pull request #111 from 394802198/master

Steven
re
Merge remote-tracking branch 'origin/master'
Merge pull request #112 from 394802198/master

2014-05-19
re
Merge pull request #109 from Cook1fan/master

Steven