Merge pull request #1 from DanielJurkovic/master

blah