Added speed support fixes #19