Merge pull request #1 from skolima/master

Various updates (see description)