Updated for new design version
Merge pull request #2 from flrent/0.1.7

Updated for new design version