Merge pull request #45 from jon0638/master

Update
Merge pull request #14 from semihyagcioglu/master

Merge pull request #45 from jon0638/master