Merge pull request #54 from kelesidis/Chris

Chris