Merge pull request #14 from am0d/master

Update for vec / slice changes