Fix2

Merge fix2 and development.