Version 1.0.56
Merged in old branch