Made tab completion awesome for issue #21