Merge pull request #6 from nicolindemann/master

Master