Merge #48: Refactoring commands.py module