Martadev

Changes commited and pushed from branch "martadev"