Build with 0.6.1