stuff
Merge pull request #2 from emrefindik/master

stuff