bug fixes
Merge pull request #3 from 007au/master

bug fixes