Second branch fixes #1

this is the first pull request from second branch