Bring issue-52 up to date with master
Tested sandbox functionality

and made changes