Almost final
Merge pull request #1 from KubSU/George

Almost final