Merge pull request #1 from wbond/master

Update this fork
Added DoxyDoc package
Fix travis-ci build error
Merge pull request #2339 from Rapptz/master

Add DoxyDoc package