Code Optimisation
Merge pull request #4 from berndverhofstadt/master

Code Optimisation