Fixed issues #1 and #2

- Issue #2 needs to be tested on IE