Merge pull request #1 from bgoli/master

minor modifications
test up merge
Merge pull request #2 from bgoli/bgoli-test-branch1

Bgoli test branch1