Merge pull request #1 from budnik/wip