Proofread by Zaki
Merge branch 'master' of github.com:david-deboer/msip-2014