issue #143 - changed to long
Merge remote-tracking branch 'origin/master'