Merge pull request #10 from bcarreno/master

Multiple changes