Manoc 2.2 beta

updated pull request