Bugfixes (#94 #95 #96 #97)
Update package.json