test
put everything into 'if' statement
Merge pull request #14 from patrickdo/refactor-conclusion

Refactor conclusion