Johannes Bugiel Merge pull request #1 from charlieroberts/master