Improved performance and code size

See this #8