Merge pull request #19 from Sean-Der/master