Merge pull request #265 from benjello/dev

Synchro of victor's work