Implemented Issue #27 - Settings