Unrestricted case on input

Fixed issue with Jeff being an issue to fix.
Merge pull request #1 from Klakurka/Refactoring

Unrestricted case on input