DELETED auto merge lines
DELETED auto merge lines
Merge pull request #20 from flubbes/jos

merge jos into update-1