Issue/476

Addresses issue #476