Merge pull request #2 from jzabrodin/master

Yeap.
Stable vers. before some refactoring.
Some something.
Merge pull request #5 from resd/master

ultimate request!!!