Merge pull request #6 from polatkoksal/master

from master to can
Merge pull request #8 from polatkoksal/can

Merge pull request #6 from polatkoksal/master