several updates
Merge pull request #35 from superherojs/update-2

several updates