Completed Issue 141 and Issue 138