Merge branch 'master' of github.com:tiger-swallowtails-2013/gossyp