add changes 141118
Merge pull request #11 from KristofHermans/141118-hp

add changes 141118