oshima
merged

Merge branch 'master' into oshima
shared -> oshima
conflict fixed
Merge branch 'master' into oshima

Conflicts:
	shared
Merge pull request #3 from white-chocolate/oshima

Oshima