Merge pull request #173 from JohannesTaelman/master