Some new tests
fixed a syntax error
added the instance ID to the window for later destroying
Merge pull request #157 from zackferraro/v2-restructured

Failed CI build is OK