Fixed a bug to work stably.
Merge branch 'master' of github.com:cignoir/YAGNPW