improving v1.2.0
Merge pull request #1 from preth00nker/development

improving v1.2.0