Fixed a returnTo bug
Bumped version to 2.1.4
Merge remote-tracking branch 'origin/master'