Merged changes from team 1-4
Merge pull request #4 from mapthegod/jones_philipp

Merged changes from team 1-4