Pending Fix for issues #30, #35.