reverted master to original state, modification are now in branch wip-1.0