Merge pull request #23 from semihyagcioglu/master

Update
Merge pull request #72 from jon0638/master

Merge pull request #23 from semihyagcioglu/master