Added module
Some code refactoring A:)
Some changes
New revision