Merge pull request #5 from awoland/master