More updates
Merge pull request #18 from jaytaph/coredocs4

More updates