Dublin 2014
Added my name
Merge pull request #299 from machinelady/add-name

Added my name
Merge pull request #1 from evildmp/master

merging upstream master