Error fix
Merge branch 'master' of github.com:pericles-project/plank