WIP
Merge branch 'master' of https://github.com/gomeZZZ/HPCLabWS14