Merge pull request #6 from dimo414/master

Updates and refactorings