Merge pull request #177 from komatits/devel

improved a stop statement