Last fix
Merge branch 'live' of github.com:OlegYarosh/pin into live