Merge pull request #23 from 3olcin/master

merge please