Merge pull request #34 from Johnmalc/master

klhgtfr