Issue#200 201

Closes #issue200 and #issue 201