update
Merge pull request #8 from Johnmalc/master

sdkjf