Addressed feature req #294
Address issue Issue #424 -- cliff and meghana
Merge pull request #441 from bb7555/master

Issue #424