added disabled
updated tests
Merge pull request #2 from topcoat/desktop-parity

Desktop parity