Version 0.6.1 changes