Added bunyon support, resolves issue #55.