Some contribs v7...
Merge remote-tracking branch 'upstream/master'
Merge pull request #14 from ekremkaraca/master

Some contribs v7...