Merge pull request #7 from tecip-nes/master

integrating commits from newlayout branch
Merge pull request #8 from tecip-nes/newlayout

Merge pull request #7 from tecip-nes/master