Merge pull request #7 from tecip-nes/master

integrating commits from newlayout branch