Fix for issue #263
Merge branch 'master' into 263-fix
Merge remote-tracking branch 'upstream/master' into 263-fix
Fix for issue #304
Merge pull request #305 from koeppea/token-fix

Fix for issue #304
Merge pull request #306 from eaescob/263-fix

263 fix