hrbrmstr Fixes #25