Merge pull request #3 from gutza1/master

Major Refactorization