Issue#123,#201

Closes #123, closes #201