ver 0.5.1

Conflicts:
package.json