Initial patch.
Merge pull request #3 from martinpaljak/update_final

Initial patch.