fixed #1 and fixed #2
Merge pull request #1 from herrbert74/master

Pull Request to continue developing