Added test for custom delimiter
Added implementation of custom delimiter.
Refactored a bit.
Small cleanup in calculator.