Fixed Various Issues

Fixed Various Issues
Merge pull request #2 from 007au/master

Fixed Various Issues