Revert "Removed default keywords for issue #50"

This reverts commit ec82ea831e6827377319a0dfe43a545b7d371340.