Simplifying code
Merge pull request #45 from fkautz/pr_out_simplifying_code