Merge pull request #14 from aproctor/master

sync
added LD stuff
Merge pull request #15 from aproctor/master

Sync
Merge pull request #33 from tylerhebenton/master

stufffffff