Merge from command line

and bump version to 1.0.4