Merge pull request #18 from kelesidis/Chris

first merge (works)