Merge pull request #6 from ErebusBat/erebusbat