Last changes to version 0.3
Merge pull request #5 from job963/develop

Last changes to version 0.3