Code compilation on Linux and addition of new classes.

This pull request has changes from 2 different commits.