Sprint of fixes and enhancements

Fixes #45, #48. Implements #3.

Tested in:
 
- [ ] Chrome
- [ ] FireFox
- [ ] Safari
- [ ] IE 10
- [ ] IE 9
- [ ] IE 8
- [ ] IE 7
- [ ] IE 6