Merge branch 'master' of github.com:phoozle/UnicraftPlugin