Merge pull request #1 from JonathanBristow/master

sync update
Merge pull request #3 from shopapps/master

Merge pull request #1 from JonathanBristow/master