Merge pull request #7 from mertenvg/master

Additional fixes