Fixed a bunch of stuff.
Merge pull request #35 from dgarzon/master

Fixed a bunch of stuff.