Bumped version to 1.3.0
Fixed merge conflict
Fixed issue #257
bumped version to 1.3.5