Fixed file references. Release candidate 4
Merge pull request #34 from hogepodge/stable/havana

Fixed file references. Release candidate 4