giddy
Resolved conflicts
Merge pull request #3 from chet-simpson/patch2

giddy