Issue 452 solved
Merge branch 'Issue452'