Merge pull request #7 from semihyagcioglu/master

Update
Merge pull request #39 from jon0638/master

Update