Merge pull request #3 from sebslomski/master