Merge pull request #11 from notaz/upstream_merge