Merge pull request #17 from TCollier92/master

theta commit 2
Merge pull request #19 from TCollier92/master

trom
Merge pull request #6 from yusuftor/master

tdfd