Merge Fixes for Issue-#18