Fix #47 Fix #48

This pull request resolves two bugs that need to be resolved before WebBlocks workshop at MMWCON.