Merge pull request #13 from Bahamada/upstream_merge