Fix package json. Thanks @NiGhTTraX. #1
Merge branch '1-dev-friendly' into 3-demo