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

Fixed a bunch of stuff.
One last thing.
Merge pull request #36 from dgarzon/master

One last thing.
Merge remote-tracking branch 'upstream/master'