Fixes #2

That is all.
Merged from master