First try to commit master branch issue #1