Merged
Resolves #94
Updated tests, testing hide dialog as well.