Up to date version
Up to date version
Merge pull request #4 from WiechersV/alex_branch

Alex branch