update
Merge pull request #12 from Johnmalc/master

UPdate