Fixed #15. Removed Command-based project