Merge pull request #66 from johanjusits/branch-1

added layout for w2 & added lv1 for w2,