Fixed issue #1
Review mvn output logs
Added unit tests for issue #1