got pig moving
Merge branch 'master' into jf-move-pig
Merge pull request #3 from jamienf/jf-move-pig

Jf move pig
Fixed merge conflicts