V 1.1

The first attempt to repair merger conflict.