EOD
Merge branch 'automation' of github.com:apitronics/Hive into automation

merging hao and louis