Minor changes. Working version 1.1