Few fixes and additions
Fixes and missing bits
Merge pull request #4 from aoehmichen/londonHackathon

London hackathon