Fixed #66
Bump to version 1.0.2
Merge branch 'origin/prod'
Merge branch 'origin/master'