Merge pull request #9 from christoph2005/master

check this out
Merge pull request #11 from christoph2005/master

Updating alexs branch from master
Merge pull request #12 from christoph2005/Alex-Branch

Alex branch