emilbjorklund Merge pull request #13 from pepelsbey/master