more bug fixes
Merge pull request #4 from 007au/master

more bug fixes