Merge pull request #39 from kelesidis/Chris

Chris