Merge pull request #84 from hmert/master

merge and fix
Merge pull request #26 from okulbilisim/master

Merge pull request #84 from hmert/master