Fixed critical bugs

Merge PR from @justhappens
Update documentation
Resolve dependency conflicts in package.json

bugfixing

Merge pull requests with bug fixing.

1.0: Merge pull request #2 from justhappens/master

fix typo which leads to fatal error