Merge pull request #3 from GeertjanWielenga/master

Get latest changes