1.0 sprint 1

This is my awesome change for ticket TI-1984