Merge pull request #22 from kelesidis/Chris

merge 80%