Merge remote-tracking branch 'origin/master' into gulp
Merge tag '0.0.2'

hotfix version 0.0.2