Fixed bugs that failed the build
Merge pull request #2 from bierlingm/hernan

Fixed bugs that failed the build