issue #6 fixed, we can all relax now

issue #6 fixed squashme

issue #6 fixed squashme2
Merge pull request #8 from bheckel/july13

issue #6 fixed, we can all relax now