Fixed shared alias resolution bug (Issue #16)
Merge branch 'master' into upstreammaster