Merge pull request #32 from edatrix/working_with_mike

Working with mike
Merge branch 'master' into working_with_mike