Latest development
Merge branch 'master' of git@github.com:walmis/xpcc.git