Performance improvements
Version 0.2.2