Improved nesting in #34, attached interdiff for same. please review