Updates
Merge pull request #63 from 007au/master

Updates