Merge pull request #82 from tothfn/master

New designs