Issue#4

please review and merge if needed.