Merge pull request #6 from polatkoksal/master

from master to can