final version!
Merge branch 'master' of github.com:gjq1218/ducking-octo-bugfixes

final version-2014.05.12