Version 0.6.2 - Code improvements and optimizations