Importing older 0.5.1 branch