Merge pull request #15 from semihyagcioglu/master

Merge pull request #47 from jon0638/master