Merge pull request #1 from jzabrodin/master

Test.
Work. With bug. Work.
Merge pull request #3 from resd/master

Yo