Merge pull request #5 from net-engine/adjustments

Adjustments
Merge branch 'master' into coveralls