Merge pull request #3 from jayhawks/master

fg
Merge pull request #4 from jayhawks/ot

dMerge pull request #3 from jayhawks/master