Fixing code convertions and commenting to close issue #15.