Cleared things up
Merge branch 'patryksbranch'