Fixes #1
Merging master