Stash
Merge branch 'master' of github.com:kreldjarn/typpi.js

Conflicts:
	typpi.js