old names
bugs everywhere
Merge pull request #34 from nicot/master

New names.