closes #111
closes #113
closes #86
Merge pull request #117 from h4cc/feature/update3

Feature/update3