Merge pull request #28 from usr42/refactorings

Refactorings