changed container to wrapper
Merge pull request #17 from francinen/master

additional changes