Merge branch 'hotfix/0.0.2'
fix port forward for logstash
Merge branch 'hotfix/0.0.3' into develop

Conflicts:
	Modulefile