Some design correction
Merge pull request #2 from shamsan/develop

Some design correction