Design changes
Merge pull request #2 from samoturk/master

Design changes