Merge pull request #144 from jmoborn/master

Commented out bjson conversion for maya checkin
Merge remote-tracking branch 'upstream/master'