Merge pull request #101 from kevmoo/master

all shiny and worky for 0.5.16
Merge pull request #102 from kevmoo/master

Green on drone.io - fixed analyzer