Merge pull request #215 from Cook1fan/master

2014-10-14
2014-10-15
Merge remote-tracking branch 'origin/master'
2014-10-15
2014-10-16
Merge pull request #225 from 394802198/master

2014-10-16