Merge pull request #118 from ksurya/design-1.0

ENH: Updated design