merge branch 20130902 #17

Closed yamanetoshi closed 11 years ago