Merge pull request #1 from adlpz/master

Total Refactor
Merge pull request #2 from adlpz/master

Some changes for the greater good
Bugfixes