added bunch of stuff
Merge pull request #11 from eyurdakul/dev

added bunch of stuff