commit at 20140618235344
sldjkfklsdjfdksMerge branch 'master' of https://github.com/swrangsar/ddpThesis