Merge pull request #5 from semihyagcioglu/master

Update
Merge pull request #35 from jon0638/master

Update