fix
fix 2
fix 3
fix 4
merge
Merge pull request #5 from philipmarivoet/philip_work

Philip work