final version?
Merge pull request #23 from zagadooga/alec

final version?