Removed default keywords for issue #50