branched the latest changes that were committed via TFS
Merge pull request #1 from mitoskalandiel/JAM-with-libs

branched the latest changes that were committed via TFS