minor bugs fixed
Merge pull request #3 from arve80/version_7

minor bugs fixed