Merge pull request #50 from asgeirn/master