15 -> 3
Merge branch 'master' of github.com:nieluj/sstic2014