Reverted buggy PRs
Merge pull request #14 from blha303/master

Reverted buggy PRs