More updates

Just some more updates
Merge pull request #39 from golyalpha/Patch

More updates