Merge with dev, closes #250