Finished most work
Merge pull request #12 from AydinTekin/aydin/finish

Finished most work