Minor functional fixes
Merge pull request #32 from victorbadila/26-Robert-Mandache

Minor functional fixes