Fixes #287
Added test case for #329.
Fixes #329
Fixes #289
Merge branch 'master' of github.com:thinkaurelius/titan