Merge pull request #16 from Lsargent/Trunk

Trunk
just need to finish feed
...