Fixed #462
Merges; Fixed #430 and Fixed #463