Merge pull request #79 from martinb3/master

Better elkstack agent handling
Bump for dev