issue #17 solved and basic Design added