Additions/fixes from rww.io
Some fixes.
More updates/fixes from rww.io
Merge pull request #8 from deiu/master

Additions/fixes from rww.io (final merge).