Merge pull request #4 from yusuftor/master

getting yusufs stuff
theta attempt 1
Merge pull request #16 from TCollier92/master

theta v 1