Merge pull request #2 from resd/master

Test
something changed
Merge origin/master
something changed
Merge pull request #1 from jzabrodin/master

Test.