Merge pull request #4 from jeszytanada/dev_1.01

Dev 1.01