Merge pull request #152 from sureshsundriyal/wip

Fix some brokenness.