joaomilho Merge pull request #11 from brakmic/small-fixes