Merge pull request #46 from pakozm/devel

New merge of devel with master
Removed net